window: Name the decoration style

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 960a8a2353b9ded80efb09b4ee63b5d1acc578ae..855706db67ffba012fb196075b1734bb7be0cf10 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6522,7 +6522,7 @@ subtract_borders (GtkBorder *one,
 static void
 style_context_save_to_decoration (GtkStyleContext *context)
 {
-  gtk_style_context_save (context);
+  gtk_style_context_save_named (context, "decoration");
 
   gtk_style_context_remove_class (context, GTK_STYLE_CLASS_BACKGROUND);
   gtk_style_context_add_class (context, "window-frame");

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f2cf9a26d314e4838af114691eaa90ee5a3cec85..551917b20cdfa7666aa258798503009d934be2d0 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3031,7 +3031,7 @@ GtkInfoBar {
   box-shadow: none; // otherwise it gets inherited by windowframe.csd
   text-shadow: 0 1px black;
   // FIXME: we need a border or tooltips vanish on black background.
-  &.window-frame.csd {
+  decoration.csd {
     background-color: transparent;
   }
 }
@@ -3220,7 +3220,7 @@ GtkVolumeButton.button {
  * Window Decorations *
  *********************/
 
-.window-frame {
+decoration {
   border-radius: 7px 7px 0 0;
   // lamefun trick to get rounded borders regardless of CSD use
   border-width: 0px;
@@ -3233,7 +3233,7 @@ GtkVolumeButton.button {
   box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
               0 0 0 1px $_wm_border; //doing borders with box-shadow
 
-  // FIXME rationalize window-frame shadows
+  // FIXME rationalize shadows
 
   /* this is used for the resize cursor area */
   margin: 10px;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 4ba76e2a2e4c986e8df37598a95379fc85456292..2e89a37f395b4d94548dcc84255c9a9349517d5a 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4070,7 +4070,7 @@ GtkInfoBar {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  .tooltip.window-frame.csd {
+  .tooltip decoration.csd {
     background-color: transparent; }
 
 .tooltip * {
@@ -4207,30 +4207,30 @@ GtkColorSwatch {
 /**********************
  * Window Decorations *
  *********************/
-.window-frame {
+decoration {
   border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(28, 31, 31, 0.9);
   /* this is used for the resize cursor area */
   margin: 10px; }
-  .window-frame:backdrop {
+  decoration:backdrop {
     box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  .window-frame.tiled {
+  decoration.tiled {
     border-radius: 0; }
-  .window-frame.popup {
+  decoration.popup {
     box-shadow: none; }
-  .window-frame.ssd {
+  decoration.ssd {
     box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  .window-frame.csd.popup {
+  decoration.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
-  .window-frame.csd.tooltip {
+  decoration.csd.tooltip {
     border-radius: 5px;
     box-shadow: none; }
-  .window-frame.csd.message-dialog {
+  decoration.csd.message-dialog {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
-  .window-frame.solid-csd {
+  decoration.solid-csd {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3c9aeb2d11047aecae10b30b63c3910ddc069e37..0924aa5012b518963662d43b7b89834552621623 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4242,7 +4242,7 @@ GtkInfoBar {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  .tooltip.window-frame.csd {
+  .tooltip decoration.csd {
     background-color: transparent; }
 
 .tooltip * {
@@ -4379,30 +4379,30 @@ GtkColorSwatch {
 /**********************
  * Window Decorations *
  *********************/
-.window-frame {
+decoration {
   border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
   /* this is used for the resize cursor area */
   margin: 10px; }
-  .window-frame:backdrop {
+  decoration:backdrop {
     box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
-  .window-frame.tiled {
+  decoration.tiled {
     border-radius: 0; }
-  .window-frame.popup {
+  decoration.popup {
     box-shadow: none; }
-  .window-frame.ssd {
+  decoration.ssd {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
-  .window-frame.csd.popup {
+  decoration.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  .window-frame.csd.tooltip {
+  decoration.csd.tooltip {
     border-radius: 5px;
     box-shadow: none; }
-  .window-frame.csd.message-dialog {
+  decoration.csd.message-dialog {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  .window-frame.solid-csd {
+  decoration.solid-csd {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 77f902e32c33f08acefaabb35ffa5586382bee1c..be7e22cf29a76ef12f86feea5ebfd3d038d545b7 100644 (file)
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -2470,7 +2470,7 @@ GtkColorSwatch {
  * Window Decorations *
  *********************/
 
-.window-frame {
+decoration {
   border-radius: 7px 7px 0 0;
   // lamefun trick to get rounded borders regardless of CSD use
   border-width: 0px;

diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 21f1a7f680772dd8f6301502109cb10164b30acf..aecb5e092fcbba8553ea58c7bccb3234221c4fc9 100644 (file)
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -2660,23 +2660,23 @@ GtkColorSwatch {
 /**********************
  * Window Decorations *
  *********************/
-.window-frame {
+decoration {
   border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
   /* this is used for the resize cursor area */
   margin: 10px; }
-  .window-frame:backdrop {
+  decoration:backdrop {
     box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
-  .window-frame.tiled {
+  decoration.tiled {
     border-radius: 0; }
-  .window-frame.csd.popup {
+  decoration.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  .window-frame.csd.tooltip {
+  decoration.csd.tooltip {
     border-radius: 5px;
     box-shadow: none; }
-  .window-frame.solid-csd {
+  decoration.solid-csd {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;